Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update location of gnxi files in test_telemetry due to docker-ptf modification #5574

Merged
merged 1 commit into from
Apr 28, 2022

Conversation

ZhaohuiS
Copy link
Contributor

Description of PR

Summary:
Fixes # (issue)
Update location of gnxi files due to docker-ptf modification
Signed-off-by: Zhaohui Sun zhaohuisun@microsoft.com

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 201911
  • 202012

Approach

What is the motivation for this PR?

PR sonic-net/sonic-buildimage#10599 move the work directory to /root.
So gnxi is moved to /root. test_telemetry failed because of wrong file location.

How did you do it?

Update /gnxi/... to /root/gnxi/...

How did you verify/test it?

run tests/telemetry/test_telemetry.py

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

Signed-off-by: Zhaohui Sun <zhaohuisun@microsoft.com>
@ZhaohuiS ZhaohuiS requested a review from a team as a code owner April 28, 2022 01:16
@ZhaohuiS ZhaohuiS requested a review from wangxin April 28, 2022 01:17
@wangxin
Copy link
Collaborator

wangxin commented May 6, 2022

This change is not required for 202012 branch. For 202012 image, we are using PTF docker image built from 202012 branch. That PTF docker does not have change sonic-net/sonic-buildimage#10599.

@wangxin
Copy link
Collaborator

wangxin commented May 11, 2022

@wenyiz2021 I guess the testbed was deployed using master branch. Then if you switch to 202012 and run this test, it will fail.
To workaround this issue, you can re-create the PTF docker using command like:

./testbed-cli.sh restart-ptf <TESTBED_NAME> password.txt -e ptf_imagetag=202012

This command will re-create the PTF docker using image with tag 202012.

I am not going to cherry-pick this change to 202012 because our 202012 nightly tests were using 202012 PTF docker. Cherry-pick this will break our nightly test for 2022012.

@ZhaohuiS Can you improve this test to check location of the gnxi files under both / and /root. Then it will work for PTF docker of both master and 202012 branch.

@wenyiz2021
Copy link
Contributor

@wenyiz2021 I guess the testbed was deployed using master branch. Then if you switch to 202012 and run this test, it will fail. To workaround this issue, you can re-create the PTF docker using command like:

./testbed-cli.sh restart-ptf <TESTBED_NAME> password.txt -e ptf_imagetag=202012

This command will re-create the PTF docker using image with tag 202012.

I am not going to cherry-pick this change to 202012 because our 202012 nightly tests were using 202012 PTF docker. Cherry-pick this will break our nightly test for 2022012.

@ZhaohuiS Can you improve this test to check location of the gnxi files under both / and /root. Then it will work for PTF docker of both master and 202012 branch.

Thanks Xin. It would be good if we get gnxi files under both dir, ow AZP run will fail on 202012.

@ZhaohuiS
Copy link
Contributor Author

@wenyiz2021 I guess the testbed was deployed using master branch. Then if you switch to 202012 and run this test, it will fail. To workaround this issue, you can re-create the PTF docker using command like:

./testbed-cli.sh restart-ptf <TESTBED_NAME> password.txt -e ptf_imagetag=202012

This command will re-create the PTF docker using image with tag 202012.

I am not going to cherry-pick this change to 202012 because our 202012 nightly tests were using 202012 PTF docker. Cherry-pick this will break our nightly test for 2022012.

@ZhaohuiS Can you improve this test to check location of the gnxi files under both / and /root. Then it will work for PTF docker of both master and 202012 branch.

Submitted a new PR #5634 to fix it.

wangxin pushed a commit that referenced this pull request May 11, 2022
What is the motivation for this PR?
PR sonic-net/sonic-buildimage#10599 move the work directory to /root.
So gnxi is moved to /root. test_telemetry failed because of wrong file location.

How did you do it?
Update /gnxi/... to /root/gnxi/...

How did you verify/test it?
run tests/telemetry/test_telemetry.py

Signed-off-by: Zhaohui Sun <zhaohuisun@microsoft.com>
@wangxin
Copy link
Collaborator

wangxin commented May 11, 2022

PR #5634 improved the telemetry test to look for gnxi under both / and /root. But that PR is based on this one. I have cherry picked both #5634 and this one to the 202012 branch. Now the telemetry test should work on PTF docker built from both master and 202012 branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants